Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show conflicts in entity feed #892

Merged
merged 4 commits into from
Nov 21, 2023
Merged

Show conflicts in entity feed #892

merged 4 commits into from
Nov 21, 2023

Conversation

matthew-white
Copy link
Member

Closes getodk/central#531. Closes getodk/central#532. Closes #816.

@matthew-white matthew-white requested a review from ktuite November 20, 2023 17:36
Copy link
Member Author

@matthew-white matthew-white left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Notes from interactive code review

src/components/entity/diff.vue Outdated Show resolved Hide resolved
src/components/entity/diff/table.vue Outdated Show resolved Hide resolved
src/components/entity/diff/row.vue Outdated Show resolved Hide resolved
test/components/entity/feed-entry.spec.js Outdated Show resolved Hide resolved
test/components/entity/diff/table.spec.js Outdated Show resolved Hide resolved
test/components/entity/diff/table.spec.js Outdated Show resolved Hide resolved
test/components/entity/diff/table.spec.js Outdated Show resolved Hide resolved
test/components/entity/diff/row.spec.js Outdated Show resolved Hide resolved
Copy link
Member

@ktuite ktuite left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking great!

@matthew-white matthew-white merged commit 4ef2d9d into master Nov 21, 2023
1 check passed
@matthew-white matthew-white deleted the entity-feed-conflicts branch November 21, 2023 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants